From 4c523cdaa5b9034ec3b72990f963263e53a01835 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 25 Jul 2025 09:16:08 +0100 Subject: [PATCH] Elide debian/emacs-common-substvars rules target --- debian/rules | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/rules b/debian/rules index efcac98349a..4fec1be4385 100755 --- a/debian/rules +++ b/debian/rules @@ -221,10 +221,6 @@ check-vars: .PHONY: check-autogen check-autogen: $(persistent_autogen_files) $(nonpersistent_autogen_files) -.PHONY: debian/emacs-common-substvars -debian/emacs-common-substvars: - debian/build-nox/src/emacs -Q --script debian/generate-emacs-builtin-package-info.el --substvars > debian/emacs-common-substvars - debian-sync: $(persistent_autogen_files) # so dh pattern rule doesn't try to handle this target true @@ -409,7 +405,7 @@ define install_common_binpkg_bits endef -override_dh_auto_install: $(autogen_install_files) debian/emacs-common-substvars +override_dh_auto_install: $(autogen_install_files) rm -rf \ $(install_dir_gtk) $(install_dir_pgtk) \ $(install_dir_nox) $(install_dir_lucid) \ @@ -617,9 +613,11 @@ override_dh_auto_install: $(autogen_install_files) debian/emacs-common-substvars rm -rf $(install_dir_nox) rm -rf $(install_dir_lucid) -# Add generated emacs:Provides to substvars execute_before_dh_gencontrol: - cat debian/emacs-common-substvars >> debian/emacs-common.substvars + debian/build-nox/src/emacs -Q \ + --script debian/generate-emacs-builtin-package-info.el \ + --substvars \ + >>debian/emacs-common.substvars # Install the per-user systemd unit in a disabled state by default. override_dh_installsystemduser: -- 2.30.2